Merge from trunk.

diff --cc src/ChangeLog
index 792208f7c29265d989e0a879fd92ab159287a596,c431eb1e7b23e0cffee4705201971623777e4672..78ab05728c6782dc986eccefc503b576e0ecba9b
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Use gnulib's dup2 module instead of rolling our own.
 +      * sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.
 +
+ 2011-06-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       * dispnew.c (scrolling_window): Before scrolling, turn off a
+       mouse-highlight in the window being scrolled.
+ 
  2011-06-24  Juanma Barranquero  <lekktu@gmail.com>
  
        Move DEFSYM to lisp.h and use everywhere.